fix: bound default lock wait timeout - #25709
Merged
Merged
Conversation
iamlinjunhong
requested review from
XuPeng-SH,
aunjgr,
heni02,
ouyuanning and
xzxiong
as code owners
July 14, 2026 07:18
Qodo reviews are paused for this user.Troubleshooting steps vary by plan Learn more → On a Teams plan? Using GitHub Enterprise Server, GitLab Self-Managed, or Bitbucket Data Center? |
heni02
approved these changes
Jul 15, 2026
ouyuanning
approved these changes
Jul 15, 2026
xzxiong
approved these changes
Jul 15, 2026
aunjgr
approved these changes
Jul 15, 2026
matrix-meow
added
size/L
XuPeng-SH
approved these changes
Jul 16, 2026
XuPeng-SH
left a comment
XuPeng-SH
left a comment
Contributor
There was a problem hiding this comment.
Reviewed ca2a670.
The timeout budget is bounded end-to-end across frontend/session propagation, local and remote lockservice paths, async waiter re-queues, lockop retries, and the safety ceiling. Waiter timers/cancellation/cleanup are symmetric, and whole-transaction rollback is covered for MySQL 1205.
Locally verified the focused lockservice/frontend/executor/lockop tests, including race coverage for waiter timer/notify and lockop deadline paths; go vet and diff checks pass. The latest delta also deterministically covers every whole-txn rollback error code.
Roll back the whole transaction on error 1205, use a 120-second transitional default, and add a bounded lockservice safety ceiling with deadline propagation and observability. Propagate per-execution budgets for background SQL and deduplicate slow-wait warnings. Part of matrixorigin#24915
Contributor
Merge Queue Status
This pull request spent 20 seconds in the queue, including 2 seconds running CI. Required conditions to merge
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
Which issue(s) this PR fixes:
issue #24915
What this PR does / why we need it:
fix: bound default lock wait timeout